merge
authorTim Deegan <tim@xen.org>
Thu, 1 Dec 2011 18:15:51 +0000 (18:15 +0000)
committerTim Deegan <tim@xen.org>
Thu, 1 Dec 2011 18:15:51 +0000 (18:15 +0000)

Trivial merge